]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
build: Update gvc to support renamed options
authorIñigo Martínez <inigomartinez@gmail.com>
Tue, 30 Jan 2018 12:37:38 +0000 (13:37 +0100)
committerIñigo Martínez <inigomartinez@gmail.com>
Tue, 30 Jan 2018 12:37:38 +0000 (13:37 +0100)
gvc has made some recent changes that rename its user options
following meson guidelines for GNOME packages[0].

The options used in gvc as a subproject have been renamed
accordingly.

[0] https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting

meson.build
subprojects/gvc

index 88766b3e4019c439b66b0096808912e113f674e4..1eec6aa27386af323ea8b2f90d481114586cda24 100644 (file)
@@ -167,12 +167,12 @@ conf_inc = include_directories('.')
 
 libgvc = subproject('gvc',
   default_options: [
-    'package-name=' + meson.project_name(),
-    'package-version=' + meson.project_version(),
+    'package_name=' + meson.project_name(),
+    'package_version=' + meson.project_version(),
     'pkgdatadir=' + pkgdatadir,
     'pkglibdir=' + pkglibdir,
     'static=false',
-    'with-introspection=true',
+    'introspection=true',
     'alsa=false'
   ]
 )
index 67533bffdcd22893b28baa411b2e75bd75dce323..6a0ac9ba69f84d763f286c5741b57ff8d87c1f45 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 67533bffdcd22893b28baa411b2e75bd75dce323
+Subproject commit 6a0ac9ba69f84d763f286c5741b57ff8d87c1f45